Merge branch 'wip.build-system-v5' of git://xenbits.xen.org/people/liuw/xen into...
authorIan Campbell <ian.campbell@citrix.com>
Fri, 27 Feb 2015 16:20:27 +0000 (16:20 +0000)
committerIan Campbell <ian.campbell@citrix.com>
Fri, 27 Feb 2015 16:20:27 +0000 (16:20 +0000)
commit226db8c65525e341bd94f5359b1d48aa81b9057f
tree8389e5555f0be8dc43fb3fb29d6d084fbe956444
parentd568f5b668b19b8f257dc60eb3252b74bf70ec10
parent7280bb923ad9853f541207f8e1aa1b4f1c513c91
Merge branch 'wip.build-system-v5' of git://xenbits.xen.org/people/liuw/xen into staging

Conflicts:
Config.mk

ijc -- resolved trivial conflict with 6dacedd707c2 "tools: update
       seabios rel-1.8.0"
.gitignore
Config.mk